dialogfix

Signed-off-by: Alex Knop <alexknoptech@protonmail.com>

diff --git a/src/gui/ResolveConflictsDialog.qml b/src/gui/ResolveConflictsDialog.qml
index e0d689b6bdfeb249dab799fc7ac688753f986f94..529181d6c1b3222937336534fe3e33e55023a6dd 100644 (file)
--- a/src/gui/ResolveConflictsDialog.qml
+++ b/src/gui/ResolveConflictsDialog.qml
@@ -46,10 +46,10 @@ ApplicationWindow {
 
     ColumnLayout {
         anchors.fill: parent
-        anchors.leftMargin: 20
-        anchors.rightMargin: 20
-        anchors.bottomMargin: 20
-        anchors.topMargin: 20
+        anchors.leftMargin: 10
+        anchors.rightMargin: 10
+        anchors.bottomMargin: 5
+        anchors.topMargin: 10
         spacing: 15
         z: 2
 
@@ -70,7 +70,7 @@ ApplicationWindow {
 
         RowLayout {
             Layout.fillWidth: true
-            Layout.topMargin: 15
+            Layout.topMargin: 5
 
             CheckBox {
                 id: selectExisting

diff --git a/theme/Style/Style.qml b/theme/Style/Style.qml
index 03c7bf932fcd764b0cea1bbca483a1ab35c3f3af..11c49a52aa66d5049b7137588b7faa9587b0cf28 100644 (file)
--- a/theme/Style/Style.qml
+++ b/theme/Style/Style.qml
@@ -154,7 +154,7 @@ QtObject {
     readonly property int bigFontPixelSizeResolveConflictsDialog: 20\r
     readonly property int fontPixelSizeResolveConflictsDialog: 15\r
     readonly property int minimumWidthResolveConflictsDialog: 600\r
-    readonly property int minimumHeightResolveConflictsDialog: 800\r
+    readonly property int minimumHeightResolveConflictsDialog: 300\r
 \r
     readonly property double smallIconScaleFactor: 0.6\r
 \r